33ed75d3e0d4b257bd2b0899310c9522b3e54237,portal-impl/test/unit/com/liferay/portal/cluster/ClusterRequestReceiverTest.java,ClusterRequestReceiverTest,testInvoke6,#,258

Before Change



		try {
			clusterExecutorImpl1 = getClusterExecutorImpl(false, false);
			clusterExecutorImpl2 = getClusterExecutorImpl(false, false);

			Address address = clusterExecutorImpl2.getLocalClusterNodeAddress();

			ClusterRequest clusterRequest1 =
				ClusterRequest.createUnicastRequest(

After Change


			// Test 1, return value is null

			clusterExecutorImpl1 = getClusterExecutorImpl();
			clusterExecutorImpl2 = getClusterExecutorImpl();

			ClusterRequest clusterRequest = ClusterRequest.createUnicastRequest(
				new MethodHandler(testMethod1MethodKey, StringPool.BLANK),
				clusterExecutorImpl2.getLocalClusterNodeAddress());

			FutureClusterResponses futureClusterResponses =
				clusterExecutorImpl1.execute(clusterRequest);

			assertFutureClusterResponsesWithoutException(
				futureClusterResponses.get(), clusterRequest.getUuid(), null,
				clusterExecutorImpl2.getLocalClusterNodeAddress());

			// Test 2, return value is not null

			String timestamp = String.valueOf(System.currentTimeMillis());

			clusterRequest = ClusterRequest.createUnicastRequest(
				new MethodHandler(testMethod1MethodKey, timestamp),
				clusterExecutorImpl2.getLocalClusterNodeAddress());

			futureClusterResponses = clusterExecutorImpl1.execute(
				clusterRequest);

			assertFutureClusterResponsesWithoutException(
				futureClusterResponses.get(), clusterRequest.getUuid(),
				timestamp, clusterExecutorImpl2.getLocalClusterNodeAddress());

			// Test 3, return value is not serializable

			clusterRequest = ClusterRequest.createUnicastRequest(
				new MethodHandler(testMethod2MethodKey),
				clusterExecutorImpl2.getLocalClusterNodeAddress());

			futureClusterResponses = clusterExecutorImpl1.execute(
				clusterRequest);

			assertFutureClusterResponsesWithException(
				futureClusterResponses, clusterRequest.getUuid(),
				clusterExecutorImpl2.getLocalClusterNodeAddress(),
				"Return value is not serializable");

			// Test 4, exception

			timestamp = String.valueOf(System.currentTimeMillis());

			clusterRequest = ClusterRequest.createUnicastRequest(
				new MethodHandler(testMethod3MethodKey, timestamp),
				clusterExecutorImpl2.getLocalClusterNodeAddress());

			futureClusterResponses = clusterExecutorImpl1.execute(
				clusterRequest);

			assertFutureClusterResponsesWithException(
				futureClusterResponses, clusterRequest.getUuid(),
				clusterExecutorImpl2.getLocalClusterNodeAddress(), timestamp);

			// Test 5, methodHandler is null

			clusterRequest = ClusterRequest.createUnicastRequest(
				null, clusterExecutorImpl2.getLocalClusterNodeAddress());

			futureClusterResponses = clusterExecutorImpl1.execute(
				clusterRequest);